Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Feb 2012 18:48:29 +0000 (10:48 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Feb 2012 18:48:29 +0000 (10:48 -0800)

Trivial merge